Warnings: Fix several warnings.
Merge pull request #413 from xsacha/master

Warnings: Fix several warnings.