Tidy up and upgrade integrations