per-core minor fixes