More fixes x2