Improvements to Normandy build.