Fixed a bunch of "warnings" from a previous commit -- i.e. compilation errors.