various relevant usage fixes