fix the issues due to refactoring carbon-kernel