A couple of more changes regarding input functionality.