more fixes [ci skip]