Fixed warnings that appear with clang v5.0