FL-300: Finished patching and included changes for clang