diff --git a/apps/enclave/Makefile b/apps/enclave/Makefile
index 60075e7ce..ee91d6348 100644
--- a/apps/enclave/Makefile
+++ b/apps/enclave/Makefile
@@ -12,9 +12,9 @@ LOGDIR = log
 OBJDIR = obj
 SRCDIR = src
 
-SAMINCDIR = ../libsam/inc
-SAMLIBDIR = ../libsam/lib
-TOMCRYPTDIR = ../libtomcrypt-0.96
+SAMINCDIR = ../sam/c/inc
+SAMLIBDIR = ../sam/c/lib
+TOMCRYPTDIR = $(HOME)/libtomcrypt-0.96
 
 #
 # Programs
diff --git a/apps/enclave/src/bigint.hpp b/apps/enclave/src/bigint.hpp
index 9142bb6a4..76707e88a 100644
--- a/apps/enclave/src/bigint.hpp
+++ b/apps/enclave/src/bigint.hpp
@@ -39,6 +39,7 @@ class Bigint {
 		Bigint(uint16_t i);
 		Bigint(uint32_t i);
 		~Bigint(void) { mp_clear(&mpi); }
+
 		uchar_t* export_uraw(size_t& size) const;
 		const mp_int& get_mp_int(void) const { return mpi; }
 		void import_uraw(const uchar_t* data, size_t size);