Some extra checks