Fix compiler warnings.

Simple changes to calm the compiler.