Address a few remaining review issues