Fix two small issues
Merge branch 'small_issue_fixes'