Various warnings cleanups

The changes made quiet several warnings seen when compiling the project.