diff --git a/.rubocop.yml b/.rubocop.yml
index 4dc7a81833816c8812f6f74c7b2cfec1e9ef8d72..600262ee85f6ceedcb1668aebb26285485be11b8 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -8,6 +8,9 @@ AllCops:
 Lint/Void:
   Enabled: false
 
+Style/ClassAndModuleChildren:
+  Enabled: false
+
 # Don't enforce documentation
 Style/Documentation:
   Enabled: false
@@ -18,6 +21,10 @@ Metrics/ClassLength:
 Metrics/MethodLength:
   Max: 50
 
+# Matrix has a lot of methods in the CS API
+Metrics/ModuleLength:
+  Max: 500
+
 Metrics/LineLength:
   Max: 190
 
diff --git a/lib/matrix_sdk/api.rb b/lib/matrix_sdk/api.rb
index ef1254de0675d11e943de970c62f40c9a7818dc1..d874aa79f23b91175b5f5d8610cfcc08aedb48f3 100644
--- a/lib/matrix_sdk/api.rb
+++ b/lib/matrix_sdk/api.rb
@@ -42,7 +42,7 @@ module MatrixSdk
       @protocols = params.fetch(:protocols, %i[CS])
       @protocols = [@protocols] unless @protocols.is_a? Array
       @protocols << :CS if @protocols.include?(:AS) && !@protocols.include?(:CS)
-      @protocols.sort.reverse.each do |prot|
+      @protocols.sort.reverse_each do |prot|
         extend MatrixSdk::Protocols.const_get(prot)
       end
 
diff --git a/lib/matrix_sdk/application_service.rb b/lib/matrix_sdk/application_service.rb
index 7a221c68def2da83921f17287e37fc9dc56a3afa..c9787658d831d01d0e1424b941e82bbaddd1d70f 100644
--- a/lib/matrix_sdk/application_service.rb
+++ b/lib/matrix_sdk/application_service.rb
@@ -58,6 +58,7 @@ module MatrixSdk
 
     def port=(port)
       raise ArgumentError, 'Port must be a number' unless port.is_a? Numeric
+
       @port = port
     end
 
@@ -66,6 +67,7 @@ module MatrixSdk
     def add_method(method, regex, proc = nil, &block)
       proc ||= block
       raise ArgumentError, 'No method specified' if proc.nil?
+
       (@method_map[method] ||= {})[regex] = proc
     end