Address some comments from Andres