`scan` style fixes and a build break fix