Changes to support latest 1.3 changes.