Misc mods to config and build.