diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb4e39eb96..0547f527c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Test: Upgrade nim-waku node to v0.6.
 
+### Fixed
+
+- Doc: Some broken links.
+
 ## [0.14.2] - 2021-11-30
 
 ### Changed
diff --git a/src/index.ts b/src/index.ts
index 324459c865..435ec291ae 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -2,8 +2,10 @@ export { getBootstrapNodes } from './lib/discovery';
 
 export * as utils from './lib/utils';
 
+export * as waku from './lib/waku';
 export { Waku, DefaultPubSubTopic } from './lib/waku';
 
+export * as waku_message from './lib/waku_message';
 export { WakuMessage } from './lib/waku_message';
 
 export {
@@ -12,14 +14,17 @@ export {
   getPublicKey,
 } from './lib/waku_message/version_1';
 
+export * as waku_light_push from './lib/waku_light_push';
 export {
   WakuLightPush,
   LightPushCodec,
   PushResponse,
 } from './lib/waku_light_push';
 
+export * as waku_relay from './lib/waku_relay';
 export { WakuRelay, RelayCodecs } from './lib/waku_relay';
 
+export * as waku_store from './lib/waku_store';
 export { PageDirection, WakuStore, StoreCodec } from './lib/waku_store';
 
 export * as proto from './proto';
diff --git a/src/lib/waku_store/index.ts b/src/lib/waku_store/index.ts
index 5e149e2d95..1607a74fb7 100644
--- a/src/lib/waku_store/index.ts
+++ b/src/lib/waku_store/index.ts
@@ -6,7 +6,7 @@ import Libp2p from 'libp2p';
 import { Peer } from 'libp2p/src/peer-store';
 import PeerId from 'peer-id';
 
-import { HistoryResponse_Error } from '../../proto/waku/v2/store';
+import { HistoryResponse_Error } from '../../proto';
 import { getPeersForProtocol, selectRandomPeer } from '../select_peer';
 import { hexToBuf } from '../utils';
 import { DefaultPubSubTopic } from '../waku';
@@ -51,13 +51,13 @@ export interface QueryOptions {
   pubSubTopic?: string;
   /**
    * The direction in which pages are retrieved:
-   * - [[Direction.BACKWARD]]: Most recent page first.
-   * - [[Direction.FORWARD]]: Oldest page first.
+   * - [[PageDirection.BACKWARD]]: Most recent page first.
+   * - [[PageDirection.FORWARD]]: Oldest page first.
    *
    * Note: This does not affect the ordering of messages with the page
    * (oldest message is always first).
    *
-   * @default [[Direction.BACKWARD]]
+   * @default [[PageDirection.BACKWARD]]
    */
   pageDirection?: PageDirection;
   /**
diff --git a/src/proto/index.ts b/src/proto/index.ts
index 8bed19281a..8c45166bb7 100644
--- a/src/proto/index.ts
+++ b/src/proto/index.ts
@@ -7,5 +7,6 @@ export {
   ContentFilter,
   HistoryQuery,
   HistoryResponse,
+  HistoryResponse_Error,
   HistoryRPC,
 } from './waku/v2/store';