Fixing errors, at least some of them