Misc updates and bug fixes
Merge remote-tracking branch 'github/master'