fixup! Fix warnings post-upgrade