Small code analysis, compiler warning related fixes.