Fix warnings post-upgrade