Fix things that didn't work