More fixes for 4.02