Fix left-over deprecation issues