Fix EVERYTHING noticably broken by the 1.8_hack update