One more use case and minor fixes.