Apply some review comments