Adjustments to SWF behavior