Minor updates
Merge branch 'refs/heads/tmp-branch'