Adjust Carla for master branch
Make carla compile in master