More warning fixes
Merge pull request #1308 from xarly/temp

More warning fixes