Address some review remarks