Some minor improvements to our building scripts.