Some changes due to problems with transactions when having many servers.