Input system fixes