Merge in other changes