a couple more fixes for spaces in directory names