Minor bug fixes
Merge branch 'master'