More bug fixes for Beta 4