New try at fixes