diff --git a/defines.h b/defines.h
index 358ddc8..94074b0 100644
--- a/defines.h
+++ b/defines.h
@@ -172,7 +172,7 @@ typedef class RenderingServer VS;
 	call(#func, ##__VA_ARGS__);
 
 #define RETURN_CALL(ret_type, func) \
-	return call(#func, ##__VA_ARGS__);
+	return call(#func);
 
 #define RETURN_CALLP(ret_type, func, ...) \
 	return call(#func, ##__VA_ARGS__);
@@ -184,7 +184,7 @@ typedef class RenderingServer VS;
 	ret_var = call(#func, ##__VA_ARGS__);
 
 #define RETURN_CALLD(ret_type, def_val, func) \
-	return call(#func, ##__VA_ARGS__);
+	return call(#func);
 
 #define RETURN_CALLPD(ret_type, def_val, func, ...) \
 	return call(#func, ##__VA_ARGS__);
diff --git a/world/terra_world_editor.cpp b/world/terra_world_editor.cpp
index c4d48a7..318a38f 100644
--- a/world/terra_world_editor.cpp
+++ b/world/terra_world_editor.cpp
@@ -48,11 +48,11 @@ bool TerraWorldEditor::forward_spatial_input_event(Camera *p_camera, const Ref<I
 		return false;
 	}
 
-	Ref<TerramanLibrary> mb = p_event;
+	Ref<InputEventMouseButton> mb = p_event;
 
 	if (mb.is_valid()) {
 		if (mb->is_pressed()) {
-			Ref<VoxelmanLibrary> lib = _world->get_library();
+			Ref<TerramanLibrary> lib = _world->get_library();
 
 			if (!lib.is_valid())
 				return false;
diff --git a/world/terra_world_editor.h b/world/terra_world_editor.h
index 090f66c..b9fe1a5 100644
--- a/world/terra_world_editor.h
+++ b/world/terra_world_editor.h
@@ -33,7 +33,7 @@ SOFTWARE.
 typedef class Transform3D Transform;
 #endif
 
-class VoxelWorld;
+class TerraWorld;
 class SpatialEditorPlugin;
 
 class TerraWorldEditor : public PanelContainer {