Rest of 1.2 updates