Rescue blocks behave as eithers and other fixes