Fixing release build errors.