Updates to ensure compatibility with Swift beta 7