Fix some minor input issues