core: minor improvements