Swapping out some old bugs for some new ones