Various changes to support 4.10