Update the docker file as well
Fix Mathieu remarks