Various fixes for Cart.ng