diff --git a/arch/riscv/core/vector_table.ld b/arch/riscv/core/vector_table.ld
index 8509ff8eb87c..5667b8935b8e 100644
--- a/arch/riscv/core/vector_table.ld
+++ b/arch/riscv/core/vector_table.ld
@@ -5,8 +5,9 @@
  */
 
 #if LINKER_ZEPHYR_FINAL && defined(CONFIG_ISR_TABLES_LOCAL_DECLARATION)
-INCLUDE isr_tables_vt.ld
 KEEP(*(.vectors.__start))
+. = ALIGN(CONFIG_ARCH_IRQ_VECTOR_TABLE_ALIGN);
+INCLUDE isr_tables_vt.ld
 #else
 KEEP(*(.vectors.*))
 #endif
diff --git a/kernel/work.c b/kernel/work.c
index bcbb3b467166..301d138fac7c 100644
--- a/kernel/work.c
+++ b/kernel/work.c
@@ -606,8 +606,8 @@ bool k_work_cancel_sync(struct k_work *work,
 static void work_timeout_handler(struct _timeout *record)
 {
 	struct k_work_q *queue = CONTAINER_OF(record, struct k_work_q, work_timeout_record);
-	struct k_work *work;
-	k_work_handler_t handler;
+	struct k_work *work = NULL;
+	k_work_handler_t handler = NULL;
 	const char *name;
 	const char *space = " ";