Minor improvements [ci skip]