Last fixes for Redis