Updates for apache 24