Some minor changes to resolve a few warnings and a few code style issues.