Update for changes in Swift libraries