More work on clearing the errors