Fix Jarvis issues