checkpoint fixes in run function