Changes needed to run error-free for JB
Changes needed to run error-free for JB