Remove two redundant FIXME marks