More path fixes for compilation issues