Fixed some input issues