SCAN fixes.