DISABLE_COMPILER_GCC_WARNING_START tweaks