Clean up some TODO and FIXME items