Fixup according to latest changes