Swift outdoor fixes