Fixes old stuff