Changes to get the release build working.