* Cleaned up a couple of FIXME's sitting around in the code