Cleanup compiler warnings
Merged pull request #326