Pretty minor Beta 6 changes