Swift fixes.