Fixes some type semantics garbage
Merge pull request #44 from Cerberus98/master

Fixes some type semantics garbage