Fixes "bugs"
More fixes