Some fixes to running