Mostly fix broken stuff