Fixed a couple of minor warnings.
Merge commit 'cb78f55' into develop