diff --git a/macros/src/codegen/post_init.rs b/macros/src/codegen/post_init.rs
index eec633ba2b..c95ee7da75 100644
--- a/macros/src/codegen/post_init.rs
+++ b/macros/src/codegen/post_init.rs
@@ -40,7 +40,7 @@ pub fn codegen(app: &App, analysis: &Analysis) -> Vec<TokenStream2> {
         // Store the monotonic
         let name = util::monotonic_ident(&monotonic.to_string());
         let name = util::mark_internal_ident(&name);
-        stmts.push(quote!(#name = Some(monotonics.#idx);));
+        stmts.push(quote!(*#name.get_mut_unchecked() = Some(monotonics.#idx);));
     }
 
     // Enable the interrupts -- this completes the `init`-ialization phase
diff --git a/macros/src/codegen/timer_queue.rs b/macros/src/codegen/timer_queue.rs
index 1d2a678e0d..cf9bb3c11b 100644
--- a/macros/src/codegen/timer_queue.rs
+++ b/macros/src/codegen/timer_queue.rs
@@ -126,7 +126,6 @@ pub fn codegen(app: &App, analysis: &Analysis, _extra: &Extra) -> Vec<TokenStrea
                 #[no_mangle]
                 #[allow(non_snake_case)]
                 unsafe fn #bound_interrupt() {
-
                     while let Some((task, index)) = rtic::export::interrupt::free(|_|
                         if let Some(mono) = #app_path::#m_ident.get_mut_unchecked().as_mut() {
                             #tq.get_mut_unchecked().dequeue(|| #disable_isr, mono)