Still trying to fix addr_stop_max.s and count_max.s