Slowly getting rid of errors