More fixes for alpha6