A couple of fixes for selection widget order PR

I haven't reviewed the code, but these errors were preventing the tests from passing.