Some minor changes related to the last one.