Address a few comments