Various fixes
More fixes