Move to newest versions from upstream