Fix two warnings with clang-3.5
Merge pull request #137 from kronbichler/master

Fix two warnings with clang-3.5