fix some old fixmes
rm last of the fixmes