Minor fixes in preparation for cvc3 debian package takeover.