minor improvements [skip ci]