Fixed issues with slow start of Savings in prod