Fixes issues from refactoring of inputs