More fixes
Bug fixes