Fix following Upgrade and others