Fix more type checking errors
Type Checker is done!