Minor fixes in Core