diff --git a/Makefile b/Makefile
index a005920..3fd3aad 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,14 @@
+RISCV_PATH = /opt/riscv32i/bin
 
 RISCV_GNU_TOOLCHAIN_GIT_REVISION = 411d134
-RISCV_GNU_TOOLCHAIN_INSTALL_PREFIX = /opt/riscv32
+RISCV_GNU_TOOLCHAIN_INSTALL_PREFIX = $(RISCV_PATH)
 
 SHELL = bash
 TEST_OBJS = $(addsuffix .o,$(basename $(wildcard tests/*.S)))
 FIRMWARE_OBJS = firmware/start.o firmware/irq.o firmware/print.o firmware/sieve.o firmware/multest.o firmware/stats.o
 GCC_WARNS  = -Werror -Wall -Wextra -Wshadow -Wundef -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings
 GCC_WARNS += -Wredundant-decls -Wstrict-prototypes -Wmissing-prototypes -pedantic # -Wconversion
-TOOLCHAIN_PREFIX = $(RISCV_GNU_TOOLCHAIN_INSTALL_PREFIX)i/bin/riscv32-unknown-elf-
+TOOLCHAIN_PREFIX = $(RISCV_GNU_TOOLCHAIN_INSTALL_PREFIX)/riscv32-unknown-elf-
 COMPRESSED_ISA = C
 
 # Add things like "export http_proxy=... https_proxy=..." here
diff --git a/firmware/sections.lds b/firmware/sections.lds
index 948814b..e1eb79f 100644
--- a/firmware/sections.lds
+++ b/firmware/sections.lds
@@ -20,5 +20,6 @@ SECTIONS {
 		*(.text);
 		*(*);
 		end = .;
+		. = ALIGN(4);
 	} > mem
 }