Apply 1.2 changes