Update to 1.2.0.1 code