Small tweaks to new interface.