More 1.7.10 fixes to Imperio

Conflicts: