alpha6 more fixes