fix some issues after master merge