Fixes to drawerlist, and other fixes