Updated type checks.