further fixes [ci skip]