More fixes for homedirs with spaces in their name.