Fix the broken stuff