Some minor changes ...