small improvements [skip ci]