repair assignment flow errors from packet changes
some type fixes for marshalling/un-marshalling of data