Swift fixes