dmilith, once you patched that diff, did it compile right out of the box?