more bug fixes for marshaller