Re-added self refs for strikes and storms