Update to latest deps and fix related issues