diff --git a/packages/core/src/componentProxy.ts b/packages/core/src/componentProxy.ts
index 7b764395..8b92fe17 100644
--- a/packages/core/src/componentProxy.ts
+++ b/packages/core/src/componentProxy.ts
@@ -1,4 +1,4 @@
-import { Component, MountedComponent } from './component'
+import { MountedComponent } from './component'
 
 const bindCache = new WeakMap()
 
@@ -77,6 +77,6 @@ const renderProxyHandlers = {
   }
 }
 
-export function createRenderProxy(instance: Component): MountedComponent {
+export function createRenderProxy(instance: any): MountedComponent {
   return new Proxy(instance, renderProxyHandlers) as MountedComponent
 }
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 945bc268..aee529bd 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -15,8 +15,8 @@ export { createComponentInstance } from './componentUtils'
 
 // Optional APIs
 // these are imported on-demand and can be tree-shaken
-export { applyDirective } from './optional/directive'
-export { Provide, Inject } from './optional/context'
+export * from './optional/directive'
+export * from './optional/context'
 
 // flags & types
 export { ComponentClass, FunctionalComponent } from './component'
diff --git a/packages/core/src/optional/directive.ts b/packages/core/src/optional/directive.ts
index 5e225386..aeab07bb 100644
--- a/packages/core/src/optional/directive.ts
+++ b/packages/core/src/optional/directive.ts
@@ -24,7 +24,7 @@ export interface Directive {
   unmounted: DirectiveHook
 }
 
-type DirectiveModifiers = Record<string, boolean>
+export type DirectiveModifiers = Record<string, boolean>
 
 export function applyDirective(
   vnode: VNode,