Fix old stuff