Beta 5 fixes