Import code fixes from Carla