bug fixes
Merge branch 'clientfix' into dev