More changes to support 1.3

Sorry these are in separate commits.