Fixes for basic use cases.