Fix more compile failures part of refactoring