Update some errors and remove some conditions