Tweaks for #16 fallout in dependencies