minor bug fixes
Merge branch 'hotfix/minor_bug_fix'