Fix errors for 6.0.2