Address a few comments (minor)