More possible fixes