Small fixes for dropdown