Update vsite.module from review by @amitaibu and @rbran100 #4436