Various changes to support 4.10

This definitley should be configurable.