Fix tracker
Update gems