Release build fixes