Adjust to recent Neos changes