fixes for recovery