Update to work on apache 2.4 and 2.2