Various bug fixes and fix the multilocales stuff.
Fix cv generation.