core: resolve minor issues