Fixing some routine interfaces.