fixing broken core/core_kernel references