Some minor fixes. This update is horrific :(
Merge remote-tracking branch 'origin/master' into Development