Tweaks to Y and XZ checks.