Removed more errors