More fixes fak