Small fixes [skip ci]