Minor featured updates [ci skip]