diff --git a/libkern/src/lib.rs b/libkern/src/lib.rs
index 448f32723..a17d6ad57 100644
--- a/libkern/src/lib.rs
+++ b/libkern/src/lib.rs
@@ -27,7 +27,6 @@ extern crate lazy_static;
 pub mod error;
 
 use core::fmt;
-use bitfield::bitfield;
 use static_assertions::assert_eq_size;
 use core::mem::size_of;
 
diff --git a/libuser/src/caps.rs b/libuser/src/caps.rs
index 9c0622567..b840fcfe7 100644
--- a/libuser/src/caps.rs
+++ b/libuser/src/caps.rs
@@ -28,17 +28,18 @@
 //!
 //! ```
 //! extern crate sunrise_libuser;
-//! use sunrise_libuser::{syscalls, caps, capabilities};
-//! kip_header!(HEADER = KipHeader {
+//! use sunrise_libuser::{syscalls, caps, capabilities, kip_header};
+//! use sunrise_libuser::caps::ProcessCategory;
+//! kip_header!(HEADER = caps::KipHeader {
 //!     magic: *b"KIP1",
 //!     name: *b"test\0\0\0\0\0\0\0\0",
 //!     title_id: 0x0200000000001000,
-//!     category: 1,
+//!     process_category: ProcessCategory::KernelBuiltin,
 //!     main_thread_priority: 0,
 //!     default_cpu_core: 0,
+//!     reserved: 0,
 //!     flags: 0,
 //!     stack_page_count: 16,
-//!     ..default::Default()
 //! });
 //!
 //! capabilities!(CAPABILITIES = Capabilities {
@@ -139,12 +140,13 @@ pub use sunrise_libkern::process::{KipHeader, ProcessCategory};
 ///
 /// ```no_run
 /// extern crate sunrise_libuser;
-/// use sunrise_libuser::{syscalls, caps, capabilities};
-/// capabilities!(HEADER = KipHeader {
+/// use sunrise_libuser::{caps, kip_header};
+/// use sunrise_libuser::caps::ProcessCategory;
+/// kip_header!(HEADER = caps::KipHeader {
 ///     magic: *b"KIP1",
 ///     name: *b"test\0\0\0\0\0\0\0\0",
 ///     title_id: 0x0200000000001000,
-///     category: 1,
+///     process_category: ProcessCategory::KernelBuiltin,
 ///     main_thread_priority: 0,
 ///     default_cpu_core: 0,
 ///     flags: 0,
diff --git a/loader/src/main.rs b/loader/src/main.rs
index 42ccfe3f2..5bf26f133 100644
--- a/loader/src/main.rs
+++ b/loader/src/main.rs
@@ -118,6 +118,7 @@ fn boot(fs: &IFileSystemProxy, titleid: u64) -> Result<(), Error> {
     Ok(())
 }
 
+/// Turn the given UTF-8 titleid into an u64 titleid.
 fn get_titleid_from_path(titleid: &[u8]) -> Result<u64, Error> {
     let titleid = str::from_utf8(titleid).or(Err(LoaderError::InvalidPath))?;
     let titleid = u64::from_str_radix(titleid, 16).or(Err(LoaderError::InvalidPath))?;