And a few more fixes.  Almost a clean build -- 5 errors left before
this update.