More fade handle fixes