Changes for Apache 2.4