Fixes by Thomas CASTELLE