Address a few minor comments