Fix commands

This makes a couple small tweaks that were needed to unfuck the commands. I think they broke when I split up the marionetteObserver file.