Re-add Xephyr's crop settings and fix rescue scoping problem