Merging latest fixes from a failed deployment env.

Oops!  I fixed the script locally then hosed the environment.  These are the fixes.