Bug fixes
More fixes