Minor changes to follow the updates in the libraries
Mainly renamings (fst/snd)
A few more fixes...