Cleaning up release build problems