Added sa=ome small merge fixes.