Minor changes to enable RELEASE builds.