4.1.0 compatability changes