A bunch of more fixes to the run commands