Minor tweaks to v1.6015, fixed -get-run-status bug