small fixes
Merge branch 'master' into hs_staging