Fix more legacy support
Upstream merge