Tank fixes