Do not set OBJECTs as data to avoid random issues, fix some dwarf issues