Fixes + recovery