issue #2430:fix some errors