Beta 6 fixes!