diff --git a/catkit_core/SynchronizationConditionVariable.h b/catkit_core/SynchronizationConditionVariable.h
index f2cabf90..2027215c 100644
--- a/catkit_core/SynchronizationConditionVariable.h
+++ b/catkit_core/SynchronizationConditionVariable.h
@@ -16,6 +16,7 @@ struct SharedStateConditionVariable
 class SynchronizationConditionVariable : public SynchronizationBase<SynchronizationConditionVariable, SharedStateConditionVariable>
 {
 	friend SynchronizationBase<SynchronizationConditionVariable, SharedStateConditionVariable>;
+
 public:
 	void Wait(long timeout_in_ms, std::function<bool()> condition, void (*error_check)());
 	void Signal();
diff --git a/catkit_core/SynchronizationSemaphore.cpp b/catkit_core/SynchronizationSemaphore.cpp
index 63a986ff..b381011f 100644
--- a/catkit_core/SynchronizationSemaphore.cpp
+++ b/catkit_core/SynchronizationSemaphore.cpp
@@ -71,7 +71,7 @@ void SynchronizationSemaphore::CreateImpl(const std::string &id, SharedState *sh
 	if (m_Semaphore == NULL)
 		throw std::runtime_error("Something went wrong while creating semaphore.");
 
-	shared_data->m_NumReadersWaiting = 0;
+	shared_state->m_NumReadersWaiting = 0;
 }
 
 void SynchronizationSemaphore::OpenImpl(const std::string &id, SharedState *shared_state)
@@ -82,7 +82,7 @@ void SynchronizationSemaphore::OpenImpl(const std::string &id, SharedState *shar
 		throw std::runtime_error("Something went wrong while opening semaphore.");
 }
 
-void SynchronizationSempahore::CloseImpl()
+void SynchronizationSemaphore::CloseImpl()
 {
     CloseHandle(m_Semaphore);
 }
diff --git a/catkit_core/SynchronizationSemaphore.h b/catkit_core/SynchronizationSemaphore.h
index 778007ba..46cd2f92 100644
--- a/catkit_core/SynchronizationSemaphore.h
+++ b/catkit_core/SynchronizationSemaphore.h
@@ -19,16 +19,16 @@ struct SharedStateSemaphore
 
 class SynchronizationSemaphore : public SynchronizationBase<SynchronizationSemaphore, SharedStateSemaphore>
 {
+	friend SynchronizationBase<SynchronizationSemaphore, SharedStateSemaphore>;
+
 public:
 	void Wait(long timeout_in_ms, std::function<bool()> condition, void (*error_check)());
 	void Signal();
 
-	void Lock();
-	void Unlock();
-
 protected:
 	void CreateImpl(const std::string &id, SharedState *shared_state);
 	void OpenImpl(const std::string &id, SharedState *shared_state);
+	void CloseImpl();
 
 	HANDLE m_Semaphore;
 };