Fixes for at least one GCC bug