Fixed some entity pivot cases.