Misc fixes

This is a set of several fixes for issues I found whilst working on the tabbed list.