diff --git a/mock/src/lib.rs b/mock/src/lib.rs
index 988acd3..02a48c1 100644
--- a/mock/src/lib.rs
+++ b/mock/src/lib.rs
@@ -2,7 +2,7 @@
 #![deny(rust_2018_idioms)]
 #![deny(warnings)]
 
-extern crate proc_macro;
+// extern crate proc_macro;
 
 use proc_macro::TokenStream;
 use rtic_syntax::Settings;
diff --git a/src/analyze.rs b/src/analyze.rs
index 9ca93b7..352fd79 100644
--- a/src/analyze.rs
+++ b/src/analyze.rs
@@ -591,7 +591,7 @@ pub type TimerQueues = BTreeMap<Core, TimerQueue>;
 #[derive(Debug)]
 pub struct TimerQueue {
     /// The capacity of the queue
-    pub capacity: u8,
+    pub capacity: u16,
 
     /// The priority ceiling of the queue
     pub ceiling: u8,
@@ -618,7 +618,7 @@ impl Default for TimerQueue {
 #[derive(Debug, Default)]
 pub struct Channel {
     /// The channel capacity
-    pub capacity: u8,
+    pub capacity: u16,
 
     /// The (sender side) priority ceiling of this SPSC channel
     pub ceiling: Ceiling,
diff --git a/src/ast.rs b/src/ast.rs
index f04ce02..4b8761d 100644
--- a/src/ast.rs
+++ b/src/ast.rs
@@ -230,7 +230,7 @@ pub struct SoftwareTaskArgs {
     pub core: u8,
 
     /// The task capacity: the maximum number of pending messages that can be queued
-    pub capacity: u8,
+    pub capacity: u16,
 
     /// The priority of this task
     pub priority: u8,
diff --git a/src/parse.rs b/src/parse.rs
index bf0533d..fe95647 100644
--- a/src/parse.rs
+++ b/src/parse.rs
@@ -301,7 +301,7 @@ fn task_args(
                         ));
                     }
 
-                    let value = lit.base10_parse::<u8>().ok();
+                    let value = lit.base10_parse::<u16>().ok();
                     if value.is_none() || value == Some(0) {
                         return Err(parse::Error::new(
                             lit.span(),