More changes that got lost in the merge somehow.