Some minor additional changes