some fixes for recovery