Some more smaller changes for redis