Some more type checking