Re: fixing some fixme code