More gcc fixes