More fixes.  Should work now.