fix broken stuff