More Haptic fixes... I think...