Fixes to model picker