Clean out a few outdated FIXME items