Fix errors from review by evocateur