Fixed missing label and goto, swapped out old Env var reference for new
one.