More small errors fixed