Fixed some more compiler errors