Clang Fixes

Fixed some issues causing builds to fail on clang/gcc