Bug fix
Some typechecking rules...