Minor patches as suggested by Frank Cusack <fcusack@fcusack.com> to ensure