More fixes for 4.00.1