Caro changes and fixes