Changes to make it work with recent spoon changes.