Additional review changes