Fixed the basic use cases to a working state.