More path fixes and settings for fixing our custom version