More fixes [ci skip]