Update to v1.2, minor changes