Australian passport holder, 2 separate transits through China

I have two separate journeys:

1. A transit from Melbourne to Shanghai, staying in Shanghai for about 3-4 days, then departing Shanghai to France. These are direct flights with no additional stop overs.

2. Then about 3 weeks after, I will have a flight from Amsterdam to Guanzhou, with a brief layover of 2 hours, then flying from Guangzhou to Melbourne. These are direct flights with no additional stop overs.

Would I require a visa for either of these journeys? Or will I be able to transit through 72/144 free on the first Journey, and 24 free on the second journey?

Cheers