Bug 1041395 - Tweak things for building.