Changes to latest libcloud caused some names in 'extra' to change..