Minor changes

Next up: Improving the interfaces.