Fixed build / runtime errors after refactoring