Input events fixes