Couple of Core fixes