Fix Beta 3 build