Fixes to support path entries with whitespace in their name.