Fix the broken things