more warnings fixes
more warning fixes
Merge branch 'warningsfixes' of https://github.com/ZappoMan/hifi into warningsfixes