Update for 1.2-beta2