Merge pull request #1632 from Wikia/VE-minor-fixes

Minor fixes for VE