Fix warnings
Merge pull request #1 from Automatic/fixwarnings

Fix warnings