fix: more set fixes