Minor adds and corrections to support direct (non-REST) use.