Fix compilation errors resulting from most recent refactor