Fix things to carry as they should