Fix more issues with textbox