Reyes added fixes