Prep for scanner support, and Fix? for crash with OC 1.4