Small changes to scan caputs
Small fixes