Follow-up fixes in TextField