more fixes
More fixes