Fixes for input management