First round of fixes to the fade handles...