fixed a couple of types
Merge branch 'master' of github.com:GMOD/Apollo