Fixing bugs to the release build