Added a couple of items from Xavier Leroy