Address some more review comments