Fixing remaining type checkers!