Minor fixes and interface mods.