Fixes to record current run stage