Corrections I didn't push
Merged (deleted my proxy handling to keep Gregoire's)