Bug fixes [ci skip]