More gcc fixes...