Address some comments from SG