core: minor updates