Clean up the rescue from stuff and fix specs