Fix up everythings