Fixes for Scan