fix some minor problem