Fix a couple warnings

Compiling with clang produces a handfull of warnings. These didn't require much of a change to resolve.