some improvements following cozy-agenda tests