Made fixes for less input error