More error cleanup