Fixed the fixme's.