- scanning fixes