Fixes

The commit history is very bad, I should probably `rebase -i` before merging ...
Somehow this should be moved to another module. Just curious, isn't that in fact isn't that a good example of `Other ? (In the sense that the end user could actually have defined this by himself if assemblage.ml didn't).