Fixed some minor Issues
Merge branch 'fix-exman' into develop