otw - A few minor extensibility changes.