misc changes for auto scan