More fixes.  These all need to be committed because the Ops instances is pulling this code from Github.