More textbox fixes