Update some deps

Tests on dev okay

Auto-merge