Updated versions and tidied up dependencies.