More than a few tweaks needed for recovery