More compiler errors fixed