fix a few interdependencies