Fixed some more warnings.
Merge branch 'master' into RedisTest