Last fixes to TextFields