Warnings

Here are some tweaks to silence the compiler warnings.