Minor additions after speaking with Sandoche