2.0.0 Beta 27 fixes