More errors fixed