Clean up and make carriers fixed