- Several fixes from the tracker
- Some minor improvements