More gcc fix.