Changes to AbstractTextField and AbstractNumberField