Fixed some use cases