Autopsy scanner fixes

All related to #2153