More type checking