Open graph fixes part 1