Minor changes for JOE run