Some more minor errors...