Minor improvements to interfaces.