beta 5 fixes