Bugfixes/clang build

After this PR, clang builds pypa just fine (3.5)