More TODOs, now that I have Mac OS X 10.6 working as well.