Small interface refinements and bug fixes.