Update build for 4.0-beta2