Fixes to broken drop downs