Version/dependency tweaks