Some fixes before running PT on Orchestra