task fixes [ci skip]