Fixed run-time crashes caused by updating to the new Clang