Minor fixes

[ci skip]