Fix everything hopefully