Fix Jarvis issues

+1 to @cheba . @swanncretin can you elaborate more on this one, please?