fix 2 fixme's, since they are fixed