Carla: Misc fixing