Small fixes, ready to VIPM