Some cart related changes