small fixes
Merge branch 'olegsbranch' into develop