Amend some errors