More typechecking