Tweak to work with no include path and working dir in the installer