Fixes on the switch field and picker fields