Fix 1462, 1468, 1480, 1483, 1490, 1497 $this instead of $object (3.5 fix)