Fix some reco bugs. Still some more seem to be present.