fix some base changes