haptic fixes and restore