More fixes or whatever