diff --git a/Compiler.h b/Compiler.h
index 260aebd33..d476ec684 100644
--- a/Compiler.h
+++ b/Compiler.h
@@ -42,7 +42,7 @@ public:
 	bytes getAssembledBytecode() { return m_context.getAssembledBytecode(m_optimize); }
 	bytes getRuntimeBytecode() { return m_runtimeContext.getAssembledBytecode(m_optimize);}
 	/// @arg _sourceCodes is the map of input files to source code strings
-	/// @arg _inJsonFromat shows weather the out should be in Json format
+	/// @arg _inJsonFromat shows whether the out should be in Json format
 	void streamAssembly(std::ostream& _stream, StringMap const& _sourceCodes = StringMap(), bool _inJsonFormat = false) const
 	{
 		m_context.streamAssembly(_stream, _sourceCodes, _inJsonFormat);
diff --git a/CompilerContext.h b/CompilerContext.h
index 3fcf0706d..9c2156bfa 100644
--- a/CompilerContext.h
+++ b/CompilerContext.h
@@ -122,8 +122,11 @@ public:
 
 	eth::Assembly const& getAssembly() const { return m_asm; }
 	/// @arg _sourceCodes is the map of input files to source code strings
-	/// @arg _inJsonFromat shows weather the out should be in Json format
-	void streamAssembly(std::ostream& _stream, StringMap const& _sourceCodes = StringMap(), bool _inJsonFormat = false) const { m_asm.stream(_stream, "", _sourceCodes, _inJsonFormat); }
+	/// @arg _inJsonFormat shows whether the out should be in Json format
+	void streamAssembly(std::ostream& _stream, StringMap const& _sourceCodes = StringMap(), bool _inJsonFormat = false) const
+	{
+		m_asm.stream(_stream, "", _sourceCodes, _inJsonFormat);
+	}
 
 	bytes getAssembledBytecode(bool _optimize = false) { return m_asm.optimise(_optimize).assemble(); }
 
diff --git a/CompilerStack.h b/CompilerStack.h
index ef3d09663..2e7c217d5 100644
--- a/CompilerStack.h
+++ b/CompilerStack.h
@@ -102,7 +102,7 @@ public:
 
 	/// Streams a verbose version of the assembly to @a _outStream.
 	/// @arg _sourceCodes is the map of input files to source code strings
-	/// @arg _inJsonFromat shows weather the out should be in Json format
+	/// @arg _inJsonFromat shows whether the out should be in Json format
 	/// Prerequisite: Successful compilation.
 	void streamAssembly(std::ostream& _outStream, std::string const& _contractName = "", StringMap _sourceCodes = StringMap(), bool _inJsonFormat = false) const;