ENH:  Addressing FIXMEs