Fixes for capability checks.