More misc fixes
Don't chalmers on run