General tweaks to fix overlooked code.
Merge remote-tracking branch 'origin/master'