clean up some fixmes