Fixes to distraction system