Fix more dependency issues due to refactoring