Some more errors fixed