Bugfixes for recent versions of Sesame