More changes after merge fiasco...