More fixes!