more fixes for whitespace paths