Some changes for using with Swift.