Cleanups
Fix for OptionalInputs