More swift fixes