Revert "Squashed clang fixes"

This reverts commit f24d7202a8094cf86b8b8bd4dcfd499dc288308d.
Build with GCC until clang fixes are fixed