Fixing gcc version mishaps