More fixes x3