Fixes for input elements