Fix issues with Set keys/entries