Fixed empty fixmes