Fixes for Recovery