Beta 3 fixes