Commit after fixing all errors