Some gcc fixes