Address the two open comments from @jlee-r7