Address some CR comments