More changes to support 1.3

Final change to support 1.3