Fixing warnings. Fixes #13