Add error fixing and clearing