Various small fixes in scan