Resolve issues raised by `autoscan`