few fixes [ci skip]