Fix for typechecker option
Got rid of some warnings