VG-1907: Fixes for error with Same as Input option