Address Joseph's review comments.