Quoted path references which break when they contain a space. Added a couple of TODOs.