Fix historical issues