Small changes

Trying to figure out why unmarshaling doesn't work