Fix loading of properties when parent path contains spaces
Cleanups