Fix some review comments