Update to M2 dependencies