Fixed some compiler errors

Added type info to some more classes