Address review comment and add fixmes.