various fixes
More fixes