Even more errors fixed