Fix a couple of spots in shell scripts that could choke on spaces