diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/PixelReader.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/PixelReader.cpp
index d85b94f43..a58ad2241 100644
--- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/PixelReader.cpp
+++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/PixelReader.cpp
@@ -3,12 +3,12 @@
 //
 // This work is licensed under the terms of the MIT license.
 // For a copy, see <https://opensource.org/licenses/MIT>.
+
 #include "Carla.h"
+#include "Carla/Sensor/PixelReader.h"
 
 #include "Engine/TextureRenderTarget2D.h"
 
-#include "Carla/Sensor/PixelReader.h"
-
 // For now we only support Vulkan on Windows.
 #if PLATFORM_WINDOWS
 #  define CARLA_WITH_VULKAN_SUPPORT 1
diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/RayCastLidar.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/RayCastLidar.cpp
index b7dfcdbe3..e1bed136d 100644
--- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/RayCastLidar.cpp
+++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/RayCastLidar.cpp
@@ -3,15 +3,16 @@
 //
 // This work is licensed under the terms of the MIT license.
 // For a copy, see <https://opensource.org/licenses/MIT>.
+
 #include "Carla.h"
+#include "Carla/Sensor/RayCastLidar.h"
+
+#include "Carla/Actor/ActorBlueprintFunctionLibrary.h"
 
 #include "DrawDebugHelpers.h"
-#include "StaticMeshResources.h"
 #include "Engine/CollisionProfile.h"
 #include "Runtime/Engine/Classes/Kismet/KismetMathLibrary.h"
-
-#include "Carla/Sensor/RayCastLidar.h"
-#include "Carla/Actor/ActorBlueprintFunctionLibrary.h"
+#include "StaticMeshResources.h"
 
 FActorDefinition ARayCastLidar::GetSensorDefinition()
 {
@@ -68,8 +69,8 @@ void ARayCastLidar::Tick(const float DeltaTime)
 
   ReadPoints(DeltaTime);
 
-  auto &stream = GetDataStream();
-  stream.Send_GameThread(*this, LidarMeasurement, stream.PopBufferFromPool());
+  auto &DataStream = GetDataStream();
+  DataStream.Send_GameThread(*this, LidarMeasurement, DataStream.PopBufferFromPool());
 }
 
 void ARayCastLidar::ReadPoints(const float DeltaTime)
diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SceneCaptureSensor.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SceneCaptureSensor.cpp
index 8b794f655..ffd50270d 100644
--- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SceneCaptureSensor.cpp
+++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SceneCaptureSensor.cpp
@@ -3,7 +3,9 @@
 //
 // This work is licensed under the terms of the MIT license.
 // For a copy, see <https://opensource.org/licenses/MIT>.
+
 #include "Carla.h"
+#include "Carla/Sensor/SceneCaptureSensor.h"
 
 #include "Components/DrawFrustumComponent.h"
 #include "Components/SceneCaptureComponent2D.h"
@@ -11,8 +13,6 @@
 #include "Engine/TextureRenderTarget2D.h"
 #include "HighResScreenshot.h"
 
-#include "Carla/Sensor/SceneCaptureSensor.h"
-
 static auto SCENE_CAPTURE_COUNTER = 0u;
 
 // =============================================================================
diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SensorFactory.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SensorFactory.cpp
index cda8e1c2d..84f738904 100644
--- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SensorFactory.cpp
+++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SensorFactory.cpp
@@ -9,9 +9,9 @@
 
 #include "Carla/Sensor/Sensor.h"
 
-
+#include <compiler/disable-ue4-macros.h>
 #include <carla/sensor/SensorRegistry.h>
-
+#include <compiler/enable-ue4-macros.h>
 
 #define LIBCARLA_SENSOR_REGISTRY_WITH_SENSOR_INCLUDES
 #include <carla/sensor/SensorRegistry.h>
diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/ShaderBasedSensor.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/ShaderBasedSensor.cpp
index a08672628..5a0cab21a 100644
--- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/ShaderBasedSensor.cpp
+++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/ShaderBasedSensor.cpp
@@ -5,11 +5,10 @@
 // For a copy, see <https://opensource.org/licenses/MIT>.
 
 #include "Carla.h"
+#include "Carla/Sensor/ShaderBasedSensor.h"
 
 #include "ConstructorHelpers.h"
 
-#include "Carla/Sensor/ShaderBasedSensor.h"
-
 bool AShaderBasedSensor::LoadPostProcessingMaterial(const FString &Path, const float Weight)
 {
   ConstructorHelpers::FObjectFinder<UMaterial> Loader(*Path);
diff --git a/Util/BuildTools/Check.sh b/Util/BuildTools/Check.sh
index 3c88c65cf..a5c930c04 100755
--- a/Util/BuildTools/Check.sh
+++ b/Util/BuildTools/Check.sh
@@ -47,7 +47,7 @@ eval set -- "$OPTS"
 while true; do
   case "$1" in
     --gdb )
-      GDB="gdb -tui --args";
+      GDB="gdb --args";
       shift ;;
     --xml )
       XML_OUTPUT=true;