Fixed a slew of warnings.  Just a couple left!