A few minor fixes

Fixing a few minor compilation warnings.