Clean up minor errors