Add one more use case, small fixes elsewhere