Two changes to instance scanner