Adjust dependencies for apache 2.4