Committing fixed up MVD server code
Some minor cleanups