More dependency version updates, plus code tweaks due to dependent API
alterations.