A couple misc fixes for ptest and ptest-runner