Slight tweaks of carts & addresses
Better handling when default addresses set or not