Various changes to support 4.10

This will break installations which want an older version.
We should make this configurable.