Fix more legacy support
Upstream merge
Fookit Patches for 1.7.8