Minor changes in Core