More places to switch to a 'release' buildType