Some more errors fixed.