Fix things so they work