diff --git a/docs/app.vue b/docs/app.vue
index 9529aa5df..4a69df411 100644
--- a/docs/app.vue
+++ b/docs/app.vue
@@ -35,8 +35,8 @@ const { data: files } = useLazyFetch('/api/search.json', {
 const { data: nav } = await useAsyncData('navigation', () => fetchContentNavigation())
 
 const navigation = computed(() => {
-  const main = nav.value.filter(item => item._path !== '/v1')
-  const v1 = nav.value.find(item => item._path === '/v1')?.children
+  const main = nav.value?.filter(item => item._path !== '/v1')
+  const v1 = nav.value?.find(item => item._path === '/v1')?.children
 
   return route.path.startsWith('/v1/') ? v1 : main
 })
@@ -81,7 +81,7 @@ provide('navigation', navigation)
     <!-- Mobile panel -->
     <template v-if="$route.path !== '/'" #panel>
       <LazyUDocsSearchButton size="md" class="mb-4 w-full" />
-      <LazyUNavigationTree :links="mapContentNavigation(navigation)" default-open :multiple="false" />
+      <LazyUNavigationTree :links="mapContentNavigation(navigation!)" default-open :multiple="false" />
     </template>
   </UHeader>
 
diff --git a/docs/editor/Monaco.vue b/docs/editor/Monaco.vue
index a808b9b1a..6a39964cc 100644
--- a/docs/editor/Monaco.vue
+++ b/docs/editor/Monaco.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+// @ts-nocheck
 const emit = defineEmits<(e: 'change', content: string) => void>()
 const editorState = ref('loading')
 const props = defineProps<{ language: string; value: string, readOnly: boolean }>()
diff --git a/docs/editor/useMonacoEditor.ts b/docs/editor/useMonacoEditor.ts
index ea36101fe..67de1bcfc 100644
--- a/docs/editor/useMonacoEditor.ts
+++ b/docs/editor/useMonacoEditor.ts
@@ -1,4 +1,5 @@
-import { watch, Ref, unref, ref } from 'vue'
+// @ts-nocheck
+import { watch, type Ref, unref, ref } from 'vue'
 import type { editor as Editor } from 'monaco-editor-core'
 import { createSingletonPromise } from '@vueuse/core'
 import { language as mdcLanguage } from '@nuxtlabs/monarch-mdc'
diff --git a/playground/document-driven/components/content/ShowArticle.vue b/playground/document-driven/components/content/ShowArticle.vue
index 8907c406b..deb4bf692 100644
--- a/playground/document-driven/components/content/ShowArticle.vue
+++ b/playground/document-driven/components/content/ShowArticle.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { ParsedArticle } from '../../types/article'
+import type { ParsedArticle } from '../../types/article'
 
 const { data } = await useAsyncData('key', () => queryContent('data').findOne())
 
diff --git a/playground/document-driven/types/article.ts b/playground/document-driven/types/article.ts
index 75ee56e41..f7173b104 100644
--- a/playground/document-driven/types/article.ts
+++ b/playground/document-driven/types/article.ts
@@ -1,4 +1,4 @@
-import { ParsedContent } from '../../../src/runtime/types'
+import type { ParsedContent } from '../../../src/runtime/types'
 
 export interface ParsedArticle extends ParsedContent {
   cover: {
diff --git a/src/runtime/composables/client-db.ts b/src/runtime/composables/client-db.ts
index a43dbc7ee..1e32da6db 100644
--- a/src/runtime/composables/client-db.ts
+++ b/src/runtime/composables/client-db.ts
@@ -7,7 +7,7 @@ import { createQuery } from '../query/query'
 import type { NavItem, ParsedContent, ParsedContentMeta } from '../types'
 import { createNav } from '../server/navigation'
 import { createPipelineFetcher } from '../query/match/pipeline'
-import { ContentQueryBuilderParams } from '../types/query'
+import type { ContentQueryBuilderParams } from '../types/query'
 import { useContentPreview } from './preview'
 
 const withContentBase = (url: string) => withBase(url, useRuntimeConfig().public.content.api.baseURL)
diff --git a/src/runtime/composables/navigation.ts b/src/runtime/composables/navigation.ts
index 875a04381..97d74b73d 100644
--- a/src/runtime/composables/navigation.ts
+++ b/src/runtime/composables/navigation.ts
@@ -3,7 +3,7 @@ import { useRuntimeConfig } from '#app'
 import type { NavItem, QueryBuilder, QueryBuilderParams } from '../types'
 import { encodeQueryParams } from '../utils/query'
 import { jsonStringify } from '../utils/json'
-import { ContentQueryBuilder } from '../types/query'
+import type { ContentQueryBuilder } from '../types/query'
 import { addPrerenderPath, shouldUseClientDB, withContentBase } from './utils'
 import { queryContent } from './query'
 import { useContentPreview } from './preview'
diff --git a/src/runtime/composables/query.ts b/src/runtime/composables/query.ts
index e3ea7a965..1ee609e83 100644
--- a/src/runtime/composables/query.ts
+++ b/src/runtime/composables/query.ts
@@ -5,7 +5,7 @@ import { createQuery } from '../query/query'
 import type { ParsedContent } from '../types'
 import { encodeQueryParams } from '../utils/query'
 import { jsonStringify } from '../utils/json'
-import { ContentQueryBuilder, ContentQueryBuilderParams } from '../types/query'
+import type { ContentQueryBuilder, ContentQueryBuilderParams } from '../types/query'
 import { addPrerenderPath, shouldUseClientDB, withContentBase } from './utils'
 import { useContentPreview } from './preview'
 
diff --git a/src/runtime/legacy/composables/client-db.ts b/src/runtime/legacy/composables/client-db.ts
index f01685c05..8933434f3 100644
--- a/src/runtime/legacy/composables/client-db.ts
+++ b/src/runtime/legacy/composables/client-db.ts
@@ -8,7 +8,7 @@ import { createQuery } from '../../query/query'
 import type { NavItem, ParsedContent, ParsedContentMeta, QueryBuilderParams } from '../../types'
 import { createNav } from '../../server/navigation'
 import { useContentPreview } from '../../composables/preview'
-import { ContentQueryBuilderParams, ContentQueryFetcher } from '../../types/query'
+import type { ContentQueryBuilderParams, ContentQueryFetcher } from '../../types/query'
 
 const withContentBase = (url: string) => withBase(url, useRuntimeConfig().public.content.api.baseURL)
 
diff --git a/src/runtime/legacy/composables/navigation.ts b/src/runtime/legacy/composables/navigation.ts
index d11a0d66a..85605a92e 100644
--- a/src/runtime/legacy/composables/navigation.ts
+++ b/src/runtime/legacy/composables/navigation.ts
@@ -3,7 +3,7 @@ import { useRuntimeConfig } from '#app'
 import type { NavItem, QueryBuilder, QueryBuilderParams } from '../../types'
 import { encodeQueryParams } from '../../utils/query'
 import { jsonStringify } from '../../utils/json'
-import { ContentQueryBuilder } from '../../types/query'
+import type { ContentQueryBuilder } from '../../types/query'
 import { addPrerenderPath, shouldUseClientDB, withContentBase } from '../../composables/utils'
 import { useContentPreview } from '../../composables/preview'
 import { queryContent } from './query'
diff --git a/src/runtime/pages/document-driven.vue b/src/runtime/pages/document-driven.vue
index 301c3d94a..cdeb4bff1 100644
--- a/src/runtime/pages/document-driven.vue
+++ b/src/runtime/pages/document-driven.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { useRuntimeConfig } from '#app'
+import type { LayoutKey } from '#build/types/layouts'
 import { useContent, useContentHead, useRequestEvent } from '#imports'
 
 const { contentHead } = useRuntimeConfig().public.content
@@ -18,7 +19,7 @@ if (contentHead) {
 
 <template>
   <div class="document-driven-page">
-    <NuxtLayout :name="layout as string || 'default'">
+    <NuxtLayout :name="layout as LayoutKey || 'default'">
       <ContentRenderer v-if="page" :key="(page as any)._id" :value="page">
         <template #empty="{ value }">
           <DocumentDrivenEmpty :value="value" />
diff --git a/src/runtime/query/match/utils.ts b/src/runtime/query/match/utils.ts
index de728dc07..9fd16b7d0 100644
--- a/src/runtime/query/match/utils.ts
+++ b/src/runtime/query/match/utils.ts
@@ -60,8 +60,8 @@ export const withKeys = (keys: string[] = []) => (obj: any) => {
 export const sortList = (data: any[], params: SortOptions) => {
   const comperable = new Intl.Collator(params.$locale as string, {
     numeric: params.$numeric as boolean,
-    caseFirst: params.$caseFirst as string,
-    sensitivity: params.$sensitivity as string
+    caseFirst: params.$caseFirst as any,
+    sensitivity: params.$sensitivity as any
   })
   const keys = Object.keys(params).filter(key => !key.startsWith('$'))
   for (const key of keys) {
diff --git a/src/runtime/server/api/navigation.ts b/src/runtime/server/api/navigation.ts
index ba0c6516d..a779dcf58 100644
--- a/src/runtime/server/api/navigation.ts
+++ b/src/runtime/server/api/navigation.ts
@@ -1,7 +1,7 @@
 import { defineEventHandler } from 'h3'
 import { cacheStorage, serverQueryContent } from '../storage'
 import { createNav } from '../navigation'
-import { ParsedContent, ParsedContentMeta } from '../../types'
+import type { ParsedContent, ParsedContentMeta } from '../../types'
 import { getContentQuery } from '../../utils/query'
 import { isPreview } from '../preview'
 
diff --git a/src/runtime/server/navigation.ts b/src/runtime/server/navigation.ts
index cca364761..4de347440 100644
--- a/src/runtime/server/navigation.ts
+++ b/src/runtime/server/navigation.ts
@@ -1,4 +1,4 @@
-import { NavItem, ParsedContentMeta } from '../types'
+import type { NavItem, ParsedContentMeta } from '../types'
 import { generateTitle } from '../transformers/path-meta'
 import { useRuntimeConfig } from '#imports'
 
diff --git a/src/runtime/server/search.ts b/src/runtime/server/search.ts
index 54c058a2e..f9ef13f40 100644
--- a/src/runtime/server/search.ts
+++ b/src/runtime/server/search.ts
@@ -1,5 +1,5 @@
 import { H3Event } from 'h3'
-import { ParsedContent, QueryBuilderWhere } from '../types'
+import type { ParsedContent, QueryBuilderWhere } from '../types'
 import { serverQueryContent } from '#content/server'
 
 export async function serverSearchContent (event: H3Event, filterQuery?: QueryBuilderWhere): Promise<ParsedContent[]> {
@@ -41,8 +41,9 @@ export function splitPageIntoSections (page: ParsedContent, { ignoredTags }: { i
   let previousHeadingLevel = 0
   const titles = []
   for (const item of page.body.children) {
-    if (isHeading(item.tag)) {
-      const currentHeadingLevel: number = Number(item.tag.match(HEADING)?.[1]) ?? 0
+    const tag = item.tag || ''
+    if (isHeading(tag)) {
+      const currentHeadingLevel: number = Number(tag.match(HEADING)?.[1]) ?? 0
 
       const title = extractTextFromAst(item).trim()
 
@@ -58,7 +59,7 @@ export function splitPageIntoSections (page: ParsedContent, { ignoredTags }: { i
       }
 
       sections.push({
-        id: `${path}#${item.props.id}`,
+        id: `${path}#${item.props?.id}`,
         title,
         titles: [...titles],
         content: '',
@@ -72,7 +73,7 @@ export function splitPageIntoSections (page: ParsedContent, { ignoredTags }: { i
       section += 1
     }
 
-    if (!isHeading(item.tag)) {
+    if (!isHeading(tag)) {
       if (!sections[section]) {
         sections[section] = {
           id: '',
diff --git a/src/runtime/server/storage.ts b/src/runtime/server/storage.ts
index 09d093243..4d744f33e 100644
--- a/src/runtime/server/storage.ts
+++ b/src/runtime/server/storage.ts
@@ -10,7 +10,7 @@ import { transformContent } from '../transformers'
 import { makeIgnored } from '../utils/config'
 import type { ModuleOptions } from '../../module'
 import { createPipelineFetcher } from '../query/match/pipeline'
-import { ContentQueryBuilder, ContentQueryBuilderParams } from '../types/query'
+import type { ContentQueryBuilder, ContentQueryBuilderParams } from '../types/query'
 import { getPreview, isPreview } from './preview'
 import { getIndexedContentsList } from './content-index'
 // @ts-ignore
diff --git a/src/runtime/transformers/component-resolver.ts b/src/runtime/transformers/component-resolver.ts
index 9fa67bef3..28fe37488 100644
--- a/src/runtime/transformers/component-resolver.ts
+++ b/src/runtime/transformers/component-resolver.ts
@@ -1,5 +1,5 @@
 import { pascalCase } from 'scule'
-import { ParsedContent } from '../types'
+import type { ParsedContent } from '../types'
 import htmlTags from '../utils/html-tags'
 import { defineTransformer } from './utils'
 
diff --git a/src/runtime/transformers/path-meta.ts b/src/runtime/transformers/path-meta.ts
index 08b355ff5..9f4599d22 100644
--- a/src/runtime/transformers/path-meta.ts
+++ b/src/runtime/transformers/path-meta.ts
@@ -1,7 +1,7 @@
 import { pascalCase } from 'scule'
 import slugify from 'slugify'
 import { withoutTrailingSlash, withLeadingSlash } from 'ufo'
-import { ParsedContent } from '../types'
+import type { ParsedContent } from '../types'
 import { defineTransformer } from './utils'
 
 const SEMVER_REGEX = /^(\d+)(\.\d+)*(\.x)?$/
diff --git a/src/runtime/transformers/utils.ts b/src/runtime/transformers/utils.ts
index 537d20f9c..f62c13a04 100644
--- a/src/runtime/transformers/utils.ts
+++ b/src/runtime/transformers/utils.ts
@@ -1,4 +1,4 @@
-import { ContentTransformer } from '../types'
+import type { ContentTransformer } from '../types'
 
 export const defineTransformer = (transformer: ContentTransformer) => {
   return transformer
diff --git a/src/runtime/transformers/yaml.ts b/src/runtime/transformers/yaml.ts
index da1e1e524..c5a1cec92 100644
--- a/src/runtime/transformers/yaml.ts
+++ b/src/runtime/transformers/yaml.ts
@@ -1,5 +1,5 @@
 import { parseFrontMatter } from 'remark-mdc'
-import { ParsedContent } from '../types'
+import type { ParsedContent } from '../types'
 import { defineTransformer } from './utils'
 
 export default defineTransformer({
diff --git a/src/runtime/types/index.d.ts b/src/runtime/types/index.d.ts
index be6c171f6..c24275f39 100644
--- a/src/runtime/types/index.d.ts
+++ b/src/runtime/types/index.d.ts
@@ -62,7 +62,7 @@ export interface ParsedContent extends ParsedContentMeta {
   /**
    * Content body
    */
-  body: MarkdownRoot
+  body: MarkdownRoot | null
 }
 
 //