Some small fixes for run.pp