Fixed Jedis time-out
General fixes