Fixing issues due to refactoring carbon-kernel