Changes for 1.2 Beta 4