patches for Core files