Added couple of fixes to make clang happy
Merge remote-tracking branch 'origin/develop' into develop