Fixes for a home directory with spaces