Fixed some issues with the input object that is passed around