Additional release build fixes for origin