Minor changes for Redis support...