Fix Carlota issues