Minor fixes [ci skip]