fixed uh ohs that showed up in clang 3.4