[Build Success] Fixing small issues arised after code reorganisation in modules.
Merge branch 'master' of https://github.com/ontop/vig