Fix calculation errors
Reactivate all trip sources