Text field fixes