More release build fixes