More improvements to platform builds.