Fixing gcc problems.