Various changes to support 4.10

Idea for me: Maybe this should be configurable?