More capability checks, refs #202