Saving build system tweaks from before