fixed some minor issues
Merge branch 'minor-fixes' into developer