Fixed compilation errors.

The master copy the source was forked from would not compile.  Corrected
these errors.