Fix Gob issues