Fixed a couple of test failures
Added backwards compat in a few more places.

This should now be backwards compatible with 1.7.5, as well as the current versions of 1.7.9.