Fixes and scanner