Fix some warnings
Merge pull request #162 from SeannyM/warning-fixes

Fix some warnings