couple of Core fixes