More fixes for 6.2