Input behavioral fixes