fix some technical issues