core: structure fixes