More dependencies fixes