diff --git a/PythonAPI/agents/navigation/local_planner.py b/PythonAPI/agents/navigation/local_planner.py
index 924e1d773..732f50697 100644
--- a/PythonAPI/agents/navigation/local_planner.py
+++ b/PythonAPI/agents/navigation/local_planner.py
@@ -202,9 +202,7 @@ class LocalPlanner(object):
                 self._waypoints_queue.popleft()
 
         if debug:
-            draw_waypoints(
-                self._vehicle.get_world(), [
-                    self._target_waypoint], z=40)
+            draw_waypoints(self._vehicle.get_world(), [self._target_waypoint], self._vehicle.get_location().z + 1.0)
 
         return control
 
diff --git a/PythonAPI/agents/navigation/roaming_agent.py b/PythonAPI/agents/navigation/roaming_agent.py
index 8263b1a61..547ddd9c2 100644
--- a/PythonAPI/agents/navigation/roaming_agent.py
+++ b/PythonAPI/agents/navigation/roaming_agent.py
@@ -124,7 +124,7 @@ class RoamingAgent(object):
                         target_vehicle_waypoint.lane_id != ego_vehicle_waypoint.lane_id:
             return False
 
-        loc = target_vehicle_waypoint.get_location()
+        loc = target_vehicle.get_location()
         return is_within_distance_ahead(loc, ego_vehicle_location, self._vehicle.get_transform().rotation.yaw,
                                         proximity_threshold)
 
diff --git a/PythonAPI/automatic_control.py b/PythonAPI/automatic_control.py
index 80d9134b4..f5ccd87d6 100644
--- a/PythonAPI/automatic_control.py
+++ b/PythonAPI/automatic_control.py
@@ -263,7 +263,7 @@ class CameraManager(object):
                     x=24, z=28.0), carla.Rotation(
                     roll=-90, pitch=-90)),
             carla.Transform(carla.Location(x=-5.5, z=2.8), carla.Rotation(pitch=-15))]
-        self._transform_index = 1
+        self._transform_index = 2
         self._sensors = [
             ['sensor.camera.rgb', cc.Raw, 'Camera RGB']]
         world = self._parent.get_world()