Peer dependencies fixes