Minor changes to fix errors caused while refactoring other projects