Code review feedback + fixed a code merge error.