Fix warnings
Merge pull request #338 from caitp/fix-warnings

Fix warnings