Fixes to pivot point