Fixed a few little niggly things.
Merge remote-tracking branch 'upstream/master'