Fix-up use cases