Some changes [ci skip]