Minor changes for qualifying run.