fix some errors in above commits