fix some fixmes