fixes in response Philippe's review