Fixed the broken stuff