Minor changes, some convenience bindings.