Fix remaining compiler warnings.  Builds and starts, but needs further
testing.