A couple extra checks