More fixes again