fix some bugs with base models