Minor tweaks for building in normal environments