Vitor fixes.

This is embarrassing - but I pasted them all by hand.