Cleaning up some more errors