more set fixes