Functional VMS changes submitted by sms@antinode.info (Steven M. Schweda).

Thank you\!
(note: not tested for now, a few nightly builds should give indications though)