Couple of bug fixes and minor interface changes.