Fixes for Beta 5.