Fix some parse errors for 6.0.3