Fixes to reduce spurious error messages
Fixed several type errors
Merge branch 'master' of github.com:cwi-swat/rascal