Release build changes

Updates to fix release build compilation