Bug fix
Fixing binary marshalling bugs