Change: some minor changes