fix some base path stuff