Beta 5 Fixes