A few tweaks while running core_cx