Try to fix dependency version issues