Fixes to set