Fixes for form elements and a links