Fix for Transmission and missing OrderedDict

Should fix issues #1335 #1537, #1538.