fix new core bugs