Fix for recovery n other stuff