Some old fixes in the code before the VIVA.