Changes for most recent Swift release