Fix broken stuff