Missed some review comments