A couple fixes for Haptic