small fixes
2nd small fixes
fix
fixes
Merge remote-tracking branch 'vumedia/master'