fix to marshalling problems
more fixes to marshalling