diff --git a/ets2panda/checker/ETSAnalyzer.cpp b/ets2panda/checker/ETSAnalyzer.cpp
index f4bd7a57055322e6dca1b4d2e72dec7cdfce3a19..1099d4f2f060797095db897940a2ac1a6dcca4f9 100644
--- a/ets2panda/checker/ETSAnalyzer.cpp
+++ b/ets2panda/checker/ETSAnalyzer.cpp
@@ -2680,7 +2680,7 @@ checker::Type *ETSAnalyzer::Check(ir::TSTypeAliasDeclaration *st) const
     }
 
     const checker::SavedTypeRelationFlagsContext savedFlagsCtx(checker->Relation(),
-                                                                 checker::TypeRelationFlag::NO_THROW_GENERIC_TYPEALIAS);
+                                                               checker::TypeRelationFlag::NO_THROW_GENERIC_TYPEALIAS);
 
     st->TypeAnnotation()->Check(checker);
 
diff --git a/ets2panda/checker/types/ets/etsTypeParameter.cpp b/ets2panda/checker/types/ets/etsTypeParameter.cpp
index 9694c2e6776786fec27fa058effbe0a804d30f5c..8f5631304a20b34df0f66c6afe4e66ecfcd85e33 100644
--- a/ets2panda/checker/types/ets/etsTypeParameter.cpp
+++ b/ets2panda/checker/types/ets/etsTypeParameter.cpp
@@ -148,7 +148,7 @@ Type *ETSTypeParameter::Substitute(TypeRelation *relation, const Substitution *s
                    replType->IsETSTypeParameter());
             auto nullishFlags = TypeFlag(TypeFlags() & TypeFlag::NULLISH);
             auto *newReplType = checker->CreateNullishType(replType, nullishFlags, checker->Allocator(), relation,
-                                                             checker->GetGlobalTypesHolder());
+                                                           checker->GetGlobalTypesHolder());
             replType = newReplType;
         }
         return replType;
diff --git a/ets2panda/compiler/core/JSCompiler.cpp b/ets2panda/compiler/core/JSCompiler.cpp
index bfa20d5ac7d7d38a339d43e963f08259f374153f..e7099b97f770c7130fc28909701a701cf02e26d2 100644
--- a/ets2panda/compiler/core/JSCompiler.cpp
+++ b/ets2panda/compiler/core/JSCompiler.cpp
@@ -917,7 +917,7 @@ void JSCompiler::Compile(const ir::NewExpression *expr) const
             pg->StoreAccumulator(expr, arg);
         }
 
-        pg->NewObject(expr, ctor, expr->Arguments().size() + 2);
+        pg->NewObject(expr, ctor, expr->Arguments().size() + 2U);
     } else {
         compiler::VReg argsObj = pg->AllocReg();
 
diff --git a/ets2panda/parser/TypedParser.cpp b/ets2panda/parser/TypedParser.cpp
index 17acf6dc80e1e637d987e716e67058037c23f141..a3018356f2b0dc8c995306197b600d68d79f8d2f 100644
--- a/ets2panda/parser/TypedParser.cpp
+++ b/ets2panda/parser/TypedParser.cpp
@@ -1216,7 +1216,7 @@ ir::TSTypeParameterInstantiation *TypedParser::ParseTypeParameterInstantiation(T
                 break;
             }
             case lexer::TokenType::PUNCTUATOR_UNSIGNED_RIGHT_SHIFT: {
-                Lexer()->BackwardToken(lexer::TokenType::PUNCTUATOR_GREATER_THAN, 2);
+                Lexer()->BackwardToken(lexer::TokenType::PUNCTUATOR_GREATER_THAN, 2U);
                 break;
             }
             case lexer::TokenType::PUNCTUATOR_GREATER_THAN: {
diff --git a/ets2panda/util/declgenEts2Ts.cpp b/ets2panda/util/declgenEts2Ts.cpp
index befbdbf67312df921c32c3b3ac7af33f2cf60638..b1e38226c854ed079ad48568fb2e37def6024113 100644
--- a/ets2panda/util/declgenEts2Ts.cpp
+++ b/ets2panda/util/declgenEts2Ts.cpp
@@ -66,7 +66,7 @@ void TSDeclGen::Generate()
     license << " */\n\n";
     Out(license.str());
     Out("declare const exports: any;");
-    OutEndl(2);
+    OutEndl(2U);
 
     for (auto *globalStatement : program_->Ast()->Statements()) {
         ResetState();
@@ -396,7 +396,7 @@ void TSDeclGen::GenImportDeclaration(const ir::ETSImportDeclaration *importDecla
     }
 
     Out(" } from \"", source, "\";");
-    OutEndl(2);
+    OutEndl(2U);
 }
 
 void TSDeclGen::GenTypeAliasDeclaration(const ir::TSTypeAliasDeclaration *typeAlias)
@@ -407,7 +407,7 @@ void TSDeclGen::GenTypeAliasDeclaration(const ir::TSTypeAliasDeclaration *typeAl
     Out("export type ", name, " = ");
     GenType(aliasedType);
     Out(";");
-    OutEndl(2);
+    OutEndl(2U);
 }
 
 void TSDeclGen::GenEnumDeclaration(const ir::TSEnumDeclaration *enumDecl)
@@ -421,7 +421,7 @@ void TSDeclGen::GenEnumDeclaration(const ir::TSEnumDeclaration *enumDecl)
     GenEnumType(enumDecl->TsType()->AsETSEnumType());
 
     Out("}");
-    OutEndl(2);
+    OutEndl(2U);
 }
 
 void TSDeclGen::GenInterfaceDeclaration(const ir::TSInterfaceDeclaration *interfaceDecl)
@@ -446,7 +446,7 @@ void TSDeclGen::GenInterfaceDeclaration(const ir::TSInterfaceDeclaration *interf
     }
 
     Out("}");
-    OutEndl(2);
+    OutEndl(2U);
 }
 
 void TSDeclGen::GenClassDeclaration(const ir::ClassDeclaration *classDecl)
@@ -504,7 +504,7 @@ void TSDeclGen::GenClassDeclaration(const ir::ClassDeclaration *classDecl)
         Out("export {", className, "};");
         OutEndl();
         Out("exports.", className, " = ", className, ";");
-        OutEndl(2);
+        OutEndl(2U);
     }
 }
 
@@ -551,7 +551,7 @@ void TSDeclGen::GenMethodDeclaration(const ir::MethodDefinition *methodDef)
         if (methodName == compiler::Signatures::INIT_METHOD) {
             Out(methodName, "();");
         }
-        OutEndl(2);
+        OutEndl(2U);
     }
 }