Updates for 1.2