Fix Scan Errors

By Camilla Mo in Program Issues