dependency upgrade, smaller fixes