Fix some fails for 6.0.3