Fixed up some bugs/fussiness in clang