Fixes for drop-downs and measure