Fix Unmarshal errors