Make it all work with sesame 2.6.10