Removed annoying compiler warnings.
Merge pull request #3356 from pontusmelke/remove-compiler-warnings

Removed annoying compiler warnings.