Updates for latest Swift version