Fix bug
More fixes