VET-43 : some small changes.