After Merge fixes