Fix Jarvis issues

:fearful: