Misc. bug fixes & updates
Misc. bug fixes.
Merge remote-tracking branch 'origin/master'