diff --git a/src/Classes/Project.gd b/src/Classes/Project.gd
index f9135ea1c..82eacc9d3 100644
--- a/src/Classes/Project.gd
+++ b/src/Classes/Project.gd
@@ -429,8 +429,8 @@ func animation_tags_changed(value : Array) -> void:
 
 		tag_c.rect_position.x = (tag.from - 1) * 39 + tag.from
 
-		var size : int = tag.to - tag.from
-		tag_c.rect_min_size.x = (size + 1) * 39
+		var tag_size : int = tag.to - tag.from
+		tag_c.rect_min_size.x = (tag_size + 1) * 39
 		tag_c.get_node("Line2D").points[2] = Vector2(tag_c.rect_min_size.x, 0)
 		tag_c.get_node("Line2D").points[3] = Vector2(tag_c.rect_min_size.x, 32)
 
diff --git a/src/Preferences/HandleShortcuts.gd b/src/Preferences/HandleShortcuts.gd
index 3d2a72868..a79bf3343 100644
--- a/src/Preferences/HandleShortcuts.gd
+++ b/src/Preferences/HandleShortcuts.gd
@@ -78,8 +78,8 @@ func _on_PresetOptionButton_item_selected(id : int) -> void:
 
 func apply_shortcuts_preset(preset) -> void:
 	for action in preset:
-		var old_input_event : InputEventKey = InputMap.get_action_list(action)[0]
-		set_action_shortcut(action, old_input_event, preset[action])
+		var _old_input_event : InputEventKey = InputMap.get_action_list(action)[0]
+		set_action_shortcut(action, _old_input_event, preset[action])
 		get_node("Shortcuts/" + action).text = OS.get_scancode_string(preset[action].get_scancode_with_modifiers())
 
 
diff --git a/src/UI/Rulers/HorizontalRuler.gd b/src/UI/Rulers/HorizontalRuler.gd
index b7af4052c..4721dc1af 100644
--- a/src/UI/Rulers/HorizontalRuler.gd
+++ b/src/UI/Rulers/HorizontalRuler.gd
@@ -43,14 +43,14 @@ func _draw() -> void:
 	first = (transform * ruler_transform * major_subdivide * minor_subdivide).affine_inverse().xform(Vector2.ZERO)
 	last = (transform * ruler_transform * major_subdivide * minor_subdivide).affine_inverse().xform(Global.main_viewport.rect_size)
 
-	for i in range(ceil(first.x), ceil(last.x)):
-		var position : Vector2 = (transform * ruler_transform * major_subdivide * minor_subdivide).xform(Vector2(i, 0))
-		if i % (major_subdivision * minor_subdivision) == 0:
+	for j in range(ceil(first.x), ceil(last.x)):
+		var position : Vector2 = (transform * ruler_transform * major_subdivide * minor_subdivide).xform(Vector2(j, 0))
+		if j % (major_subdivision * minor_subdivision) == 0:
 			draw_line(Vector2(position.x + RULER_WIDTH, 0), Vector2(position.x + RULER_WIDTH, RULER_WIDTH), Color.white)
-			var val = (ruler_transform * major_subdivide * minor_subdivide).xform(Vector2(i, 0)).x
+			var val = (ruler_transform * major_subdivide * minor_subdivide).xform(Vector2(j, 0)).x
 			draw_string(font, Vector2(position.x + RULER_WIDTH + 2, font.get_height() - 4), str(int(val)))
 		else:
-			if i % minor_subdivision == 0:
+			if j % minor_subdivision == 0:
 				draw_line(Vector2(position.x + RULER_WIDTH, RULER_WIDTH * 0.33), Vector2(position.x + RULER_WIDTH, RULER_WIDTH), Color.white)
 			else:
 				draw_line(Vector2(position.x + RULER_WIDTH, RULER_WIDTH * 0.66), Vector2(position.x + RULER_WIDTH, RULER_WIDTH), Color.white)
diff --git a/src/UI/Rulers/VerticalRuler.gd b/src/UI/Rulers/VerticalRuler.gd
index ab1f03dcc..cee498de7 100644
--- a/src/UI/Rulers/VerticalRuler.gd
+++ b/src/UI/Rulers/VerticalRuler.gd
@@ -43,17 +43,17 @@ func _draw() -> void:
 	first = (transform * ruler_transform * major_subdivide * minor_subdivide).affine_inverse().xform(Vector2.ZERO)
 	last = (transform * ruler_transform * major_subdivide * minor_subdivide).affine_inverse().xform(Global.main_viewport.rect_size)
 
-	for i in range(ceil(first.y), ceil(last.y)):
-		var position : Vector2 = (transform * ruler_transform * major_subdivide * minor_subdivide).xform(Vector2(0, i))
-		if i % (major_subdivision * minor_subdivision) == 0:
+	for j in range(ceil(first.y), ceil(last.y)):
+		var position : Vector2 = (transform * ruler_transform * major_subdivide * minor_subdivide).xform(Vector2(0, j))
+		if j % (major_subdivision * minor_subdivision) == 0:
 			draw_line(Vector2(0, position.y), Vector2(RULER_WIDTH, position.y), Color.white)
 			var text_xform = Transform2D(-PI / 2, Vector2(font.get_height() - 4, position.y - 2))
 			draw_set_transform_matrix(get_transform() * text_xform)
-			var val = (ruler_transform * major_subdivide * minor_subdivide).xform(Vector2(0, i)).y
+			var val = (ruler_transform * major_subdivide * minor_subdivide).xform(Vector2(0, j)).y
 			draw_string(font, Vector2(), str(int(val)))
 			draw_set_transform_matrix(get_transform())
 		else:
-			if i % minor_subdivision == 0:
+			if j % minor_subdivision == 0:
 				draw_line(Vector2(RULER_WIDTH * 0.33, position.y), Vector2(RULER_WIDTH, position.y), Color.white)
 			else:
 				draw_line(Vector2(RULER_WIDTH * 0.66, position.y), Vector2(RULER_WIDTH, position.y), Color.white)
diff --git a/src/UI/Timeline/FrameTagDialog.gd b/src/UI/Timeline/FrameTagDialog.gd
index a7acd29ff..f6fdd7b3a 100644
--- a/src/UI/Timeline/FrameTagDialog.gd
+++ b/src/UI/Timeline/FrameTagDialog.gd
@@ -6,7 +6,7 @@ var tag_vboxes := []
 var delete_tag_button : Button
 
 onready var main_vbox_cont : VBoxContainer = $VBoxContainer/ScrollContainer/VBoxTagContainer
-onready var add_tag_button : TextureButton = $VBoxContainer/ScrollContainer/VBoxTagContainer/AddTag
+onready var add_tag_button : Button = $VBoxContainer/ScrollContainer/VBoxTagContainer/AddTag
 onready var options_dialog = $TagOptions