beta 6 fixes