Fixes for text fields
Fixes for text fields