Updates for apache 24

I think we should keep the style the same as the upstream if possible.