Changes to capability check processing