changes necessary for swift beta 3