Scan: fix compiler warnings
Merge branch 'master' into satradix