More path fixes and installer fix