Input components fixed bugs