Warnings

Fix more warnings on Mac, see https://gist.github.com/lasconic/39499572b85ebca8302b