Tension fixes