Updated for beta 7 changes
Changes to comply with the Swift syntax changes as of beta 7