Repaired some broken stuff