Astros' Carlos Correa making progress in rehab, could return in September