Fixed again, some more compiler errors