Fixing more clang warnings (as listed here: https://gist.github.com/4455832)