Small fixes to help while actually building.