Fixes to selectbox