Beta 3 compatibility changes