Bugfixes for new Message-Queue + Persistence-Container versions