Merge Clean Up 1
More merge fixes