Sync with changes to crun.py