Fix Jarvis issues

I hope this is just an experiment before the final fix.