Merge problem fixes