starwing minor tweaks [skip ci]