Fix some raw types.