More improvements

[ci skip]