Fixed leftovers