Temporary fixes for recover

This patch "fixes" --recover, I am opening new issues for more widespread changes that were discussed.
(closes #3436)