some fixes
Merge branch 'MYG000-132' of https://github.com/Jero786/v-gar into MYG000-132