bug fixes
More fixes